From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 18 Jun 2016 22:54:28 +0000 (+0200)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~2865^2~211
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f01684313faa9803ddc69e71b66d9a469f955348;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

d765175 Fix ifdef-vs-if typo with RANDR13_LIBRARY
---

f01684313faa9803ddc69e71b66d9a469f955348